Network: show Not Connected instead of Off when wifi radio is on

When wifi is powered but not connected, show Not Connected instead
of off. This avoids a Off status next to a Turn Off menu item.

https://bugzilla.gnome.org/show_bug.cgi?id=709043

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 598b5bb5dae6d4cca7f9140c142bd156afdf78a3..78e44f3954b8f21f58ca4ba703dcc62c97ed5cd5 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1072,10 +1072,17 @@ const NMDeviceWireless = new Lang.Class({
 
     _getStatus: function() {
         let ap = this._device.active_access_point;
-        if (!ap)
-            return _("Off"); // XXX -- interpret actual status
 
-        return ssidToLabel(ap.get_ssid());
+        if (ap)
+            return ssidToLabel(ap.get_ssid());
+        else if (!this._client.wireless_hardware_enabled)
+            return _("Hardware Disabled");
+        else if (!this._client.wireless_enabled)
+            return _("Off");
+        else if (this._device.state == NetworkManager.DeviceState.DISCONNECTED)
+            return _("Not Connected");
+        else
+            return '';
     },
 
     _getMenuIcon: function() {